@nstudio/ui-collectionview 5.0.5 → 5.1.4

package/index.android.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-redeclare */
 import { ChangeType, ContentView, Property, ProxyViewContainer, Trace, Utils, View, booleanConverter, paddingBottomProperty, paddingLeftProperty, paddingRightProperty, paddingTopProperty, profile } from '@nativescript/core';
-import { reorderLongPressEnabledProperty, reorderingEnabledProperty, reverseLayoutProperty, scrollBarIndicatorVisibleProperty } from './common';
+import { reorderLongPressEnabledProperty, reorderingEnabledProperty, reverseLayoutProperty, scrollBarIndicatorVisibleProperty } from '.';
 import { CLog, CLogTypes, CollectionViewBase, ListViewViewTypes, isScrollEnabledProperty, orientationProperty } from './common';
 export * from './common';
 let CollectionViewCellHolder;
@@ -125,6 +125,7 @@ export class CollectionView extends CollectionViewBase {
     initNativeView() {
         this.setOnLayoutChangeListener();
         super.initNativeView();
+        const nativeView = this.nativeViewProtected;
         this.recycledViewPool = new com.nativescript.collectionview.RecycledViewPool();
         this.recycledViewPoolDisposeListener = new com.nativescript.collectionview.RecycledViewPool.ViewPoolListener({
             onViewHolderDisposed: (holder) => {
@@ -136,14 +137,7 @@ export class CollectionView extends CollectionViewBase {
                 }
                 const isNonSync = holder['defaultItemView'] === true;
                 const view = isNonSync ? holder.view.content : holder.view;
-                const args = {
-                    eventName: CollectionViewBase.itemDisposingEvent,
-                    index: holder.getAdapterPosition(),
-                    object: this,
-                    view,
-                    android: holder
-                };
-                this.notify(args);
+                this.notifyForItemAtIndex(CollectionViewBase.itemDisposingEvent, view, holder.getAdapterPosition(), view.bindingContext, holder);
                 if (view && view.isLoaded) {
                     view.callUnloaded();
                 }
@@ -161,44 +155,39 @@ export class CollectionView extends CollectionViewBase {
                 }
                 const isNonSync = holder['defaultItemView'] === true;
                 const view = isNonSync ? holder.view.content : holder.view;
-                const args = {
-                    eventName: CollectionViewBase.itemRecyclingEvent,
-                    index: holder.getAdapterPosition(),
-                    object: this,
-                    view,
-                    android: holder
-                };
-                this.notify(args);
+                this.notifyForItemAtIndex(CollectionViewBase.itemRecyclingEvent, view, holder.getAdapterPosition(), view.bindingContext, holder);
             }
         }));
-        this.android.setRecyclerListener(recyclerListener);
-        this.android.setRecycledViewPool(this.recycledViewPool);
+        nativeView.setRecyclerListener(recyclerListener);
+        nativeView.setRecycledViewPool(this.recycledViewPool);
         // nativeView.owner = new WeakRef(this);
         // nativeView.sizeChangedListener = new com.nativescript.collectionview.SizeChangedListener({
         //     onSizeChanged: (w, h, oldW, oldH) => this.onSizeChanged(w, h),
         // });
         // const orientation = this._getLayoutManagarOrientation();
         // initGridLayoutManager();
+        let layoutManager;
         if (CollectionViewBase.layoutStyles[this.layoutStyle]) {
-            this.android.layoutManager = CollectionViewBase.layoutStyles[this.layoutStyle].createLayout(this);
+            layoutManager = CollectionViewBase.layoutStyles[this.layoutStyle].createLayout(this);
         }
         else {
-            this.android.layoutManager = new com.nativescript.collectionview.PreCachingGridLayoutManager(this._context, 1);
+            layoutManager = new com.nativescript.collectionview.PreCachingGridLayoutManager(this._context, 1);
             // layoutManager = new PreCachingGridLayoutManager(this._context, 1);
             // (layoutManager as any).owner = new WeakRef(this);
         }
         // this.spanSize
-        this.android.setLayoutManager(this.android.layoutManager);
-        this.android.sizeChangedListener = new com.nativescript.collectionview.SizeChangedListener({
+        nativeView.setLayoutManager(layoutManager);
+        nativeView.layoutManager = layoutManager;
+        nativeView.sizeChangedListener = new com.nativescript.collectionview.SizeChangedListener({
             onSizeChanged() { },
             onMeasure: () => this.updateInnerSize()
         });
         this.spanSize = this._getSpanSize;
-        // const animator = new com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator();
-        // // Change animations are enabled by default since support-v7-recyclerview v22.
-        // // Need to disable them when using animation indicator.
-        // animator.setSupportsChangeAnimations(false);
-        // this.android.setItemAnimator(animator);
+        const animator = new com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator();
+        // Change animations are enabled by default since support-v7-recyclerview v22.
+        // Need to disable them when using animation indicator.
+        animator.setSupportsChangeAnimations(false);
+        nativeView.setItemAnimator(animator);
         this.refresh();
     }
     disposeNativeView() {
@@ -208,17 +197,18 @@ export class CollectionView extends CollectionViewBase {
         //     return true;
         // });
         // this._realizedItems.clear();
-        this.android.setRecyclerListener(null);
-        this.android.setRecycledViewPool(null);
+        const nativeView = this.nativeViewProtected;
+        nativeView.setRecyclerListener(null);
+        nativeView.setRecycledViewPool(null);
         this.recycledViewPoolDisposeListener = null;
         this.recycledViewPool = null;
-        if (this.android.scrollListener) {
-            this.android.removeOnScrollListener(this.android.scrollListener);
-            this.android.scrollListener = null;
+        if (nativeView.scrollListener) {
+            this.nativeView.removeOnScrollListener(nativeView.scrollListener);
+            nativeView.scrollListener = null;
             this._nScrollListener = null;
         }
-        this.android.sizeChangedListener = null;
-        this.android.layoutManager = null;
+        nativeView.sizeChangedListener = null;
+        nativeView.layoutManager = null;
         this._listViewAdapter = null;
         this._itemTouchHelper = null;
         this._simpleItemTouchCallback = null;
@@ -262,27 +252,24 @@ export class CollectionView extends CollectionViewBase {
     }
     attachScrollListener() {
         if (this._scrollOrLoadMoreChangeCount > 0 && this.isLoaded) {
-            if (!this.android) {
-                return;
-            }
-            if (!this.android.scrollListener) {
+            const nativeView = this.nativeViewProtected;
+            if (!nativeView.scrollListener) {
                 this._nScrollListener = new com.nativescript.collectionview.OnScrollListener.Listener({
                     onScrollStateChanged: this.onScrollStateChanged.bind(this),
                     onScrolled: this.onScrolled.bind(this)
                 });
-                this.android.scrollListener = new com.nativescript.collectionview.OnScrollListener(this._nScrollListener);
-                this.android.addOnScrollListener(this.android.scrollListener);
+                const scrollListener = new com.nativescript.collectionview.OnScrollListener(this._nScrollListener);
+                nativeView.addOnScrollListener(scrollListener);
+                nativeView.scrollListener = scrollListener;
             }
         }
     }
     detachScrollListener() {
         if (this._scrollOrLoadMoreChangeCount === 0 && this.isLoaded) {
-            if (!this.android) {
-                return;
-            }
-            if (this.android.scrollListener) {
-                this.android.removeOnScrollListener(this.android.scrollListener);
-                this.android.scrollListener = null;
+            const nativeView = this.nativeViewProtected;
+            if (nativeView.scrollListener) {
+                this.nativeView.removeOnScrollListener(nativeView.scrollListener);
+                nativeView.scrollListener = null;
                 this._nScrollListener = null;
             }
         }
@@ -320,10 +307,7 @@ export class CollectionView extends CollectionViewBase {
                 const lastVisibleItemPos = layoutManager['findLastCompletelyVisibleItemPosition']();
                 const loadMoreItemIndex = this.items.length - this.loadMoreThreshold;
                 if (lastVisibleItemPos === loadMoreItemIndex) {
-                    this.notify({
-                        eventName: CollectionViewBase.loadMoreItemsEvent,
-                        object: this
-                    });
+                    this.notify({ eventName: CollectionViewBase.loadMoreItemsEvent });
                 }
             }
             else if (layoutManager['findLastCompletelyVisibleItemPositions'] && layoutManager['getSpanCount']) {
@@ -337,10 +321,7 @@ export class CollectionView extends CollectionViewBase {
                 }
                 const loadMoreItemIndex = this.items.length - this.loadMoreThreshold;
                 if (lastVisibleItemPos >= loadMoreItemIndex) {
-                    this.notify({
-                        eventName: CollectionViewBase.loadMoreItemsEvent,
-                        object: this
-                    });
+                    this.notify({ eventName: CollectionViewBase.loadMoreItemsEvent });
                 }
             }
         }
@@ -375,10 +356,10 @@ export class CollectionView extends CollectionViewBase {
     }
     //@ts-ignore
     get android() {
-        return this.nativeViewProtected;
+        return this.nativeView;
     }
     get layoutManager() {
-        return this.android && this.android.layoutManager;
+        return this.nativeViewProtected && this.nativeViewProtected.layoutManager;
     }
     _getViewLayoutParams() {
         if (this.isHorizontal()) {
@@ -398,21 +379,21 @@ export class CollectionView extends CollectionViewBase {
     }
     setNativePoolSize(key, nativeIndex) {
         if (this.desiredPoolSize.has(key)) {
-            this.android.getRecycledViewPool().setMaxRecycledViews(nativeIndex, this.desiredPoolSize.get(key));
+            this.nativeViewProtected.getRecycledViewPool().setMaxRecycledViews(nativeIndex, this.desiredPoolSize.get(key));
         }
         else {
             if (this.defaultPoolSize >= 0) {
-                this.android.getRecycledViewPool().setMaxRecycledViews(nativeIndex, this.defaultPoolSize);
+                this.nativeViewProtected.getRecycledViewPool().setMaxRecycledViews(nativeIndex, this.defaultPoolSize);
             }
         }
     }
     setPoolSizes() {
-        if (!this.android || !this.templateTypeNumberString) {
+        if (!this.nativeViewProtected || !this.templateTypeNumberString) {
             return;
         }
         this.desiredPoolSize.forEach((v, k) => {
             if (this.templateTypeNumberString.has(k)) {
-                this.android.getRecycledViewPool().setMaxRecycledViews(this.templateTypeNumberString.get(k), v);
+                this.nativeViewProtected.getRecycledViewPool().setMaxRecycledViews(this.templateTypeNumberString.get(k), v);
             }
         });
     }
@@ -474,9 +455,7 @@ export class CollectionView extends CollectionViewBase {
         }
     }
     [nestedScrollingEnabledProperty.setNative](value) {
-        if (this.android) {
-            this.android.setNestedScrollingEnabled(value);
-        }
+        this.nativeViewProtected.setNestedScrollingEnabled(value);
     }
     [extraLayoutSpaceProperty.setNative](value) {
         const layoutManager = this.layoutManager;
@@ -485,9 +464,7 @@ export class CollectionView extends CollectionViewBase {
         }
     }
     [itemViewCacheSizeProperty.setNative](value) {
-        if (this.android) {
-            this.android.setItemViewCacheSize(value);
-        }
+        this.nativeViewProtected.setItemViewCacheSize(value);
     }
     [scrollBarIndicatorVisibleProperty.getDefault]() {
         return true;
@@ -496,14 +473,14 @@ export class CollectionView extends CollectionViewBase {
         this.updateScrollBarVisibility(value);
     }
     updateScrollBarVisibility(value) {
-        if (!this.android) {
+        if (!this.nativeViewProtected) {
             return;
         }
         if (this.orientation === 'horizontal') {
-            this.android.setHorizontalScrollBarEnabled(value);
+            this.nativeViewProtected.setHorizontalScrollBarEnabled(value);
         }
         else {
-            this.android.setVerticalScrollBarEnabled(value);
+            this.nativeViewProtected.setVerticalScrollBarEnabled(value);
         }
     }
     enumerateViewHolders(cb) {
@@ -534,11 +511,12 @@ export class CollectionView extends CollectionViewBase {
         }
     }
     onReorderLongPress(motionEvent) {
-        if (!this.android) {
+        const collectionView = this.nativeViewProtected;
+        if (!collectionView) {
             return;
         }
-        const view = this.android.findChildViewUnder(motionEvent.getX(), motionEvent.getY());
-        const viewHolder = view != null ? this.android.getChildViewHolder(view) : null;
+        const view = collectionView.findChildViewUnder(motionEvent.getX(), motionEvent.getY());
+        const viewHolder = view != null ? collectionView.getChildViewHolder(view) : null;
         if (viewHolder) {
             this.startViewHolderDragging(viewHolder.getAdapterPosition(), viewHolder);
         }
@@ -552,9 +530,6 @@ export class CollectionView extends CollectionViewBase {
         super._reorderItemInSource(oldPosition, newPosition, false);
     }
     [reorderLongPressEnabledProperty.setNative](value) {
-        if (!this.android) {
-            return;
-        }
         if (value) {
             if (!this._longPressGesture) {
                 this._longPressGesture = new androidx.core.view.GestureDetectorCompat(this._context, new LongPressGestureListenerImpl(new WeakRef(this)));
@@ -569,25 +544,22 @@ export class CollectionView extends CollectionViewBase {
                     onRequestDisallowInterceptTouchEvent: (disallowIntercept) => { }
                 });
             }
-            this.android.addOnItemTouchListener(this._itemTouchListerner);
+            this.nativeViewProtected.addOnItemTouchListener(this._itemTouchListerner);
         }
         else {
             if (this._itemTouchListerner) {
-                this.android.removeOnItemTouchListener(this._itemTouchListerner);
+                this.nativeViewProtected.removeOnItemTouchListener(this._itemTouchListerner);
             }
         }
     }
     [reorderingEnabledProperty.setNative](value) {
-        if (!this.android) {
-            return;
-        }
         if (value) {
             if (!this._simpleItemTouchCallback) {
                 const ItemTouchHelper = androidx.recyclerview.widget.ItemTouchHelper;
                 this._simpleItemTouchCallback = new SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN | ItemTouchHelper.START | ItemTouchHelper.END, 0);
                 this._simpleItemTouchCallback.owner = new WeakRef(this);
                 this._itemTouchHelper = new androidx.recyclerview.widget.ItemTouchHelper(this._simpleItemTouchCallback);
-                this._itemTouchHelper.attachToRecyclerView(this.android);
+                this._itemTouchHelper.attachToRecyclerView(this.nativeViewProtected);
             }
         }
     }
@@ -610,7 +582,7 @@ export class CollectionView extends CollectionViewBase {
         this.refresh();
     }
     setOnLayoutChangeListener() {
-        if (this.android) {
+        if (this.nativeViewProtected) {
             const owner = this;
             this.layoutChangeListenerIsSet = true;
             this.layoutChangeListener =
@@ -625,7 +597,7 @@ export class CollectionView extends CollectionViewBase {
                             }
                         }
                     });
-            this.android.addOnLayoutChangeListener(this.layoutChangeListener);
+            this.nativeViewProtected.addOnLayoutChangeListener(this.layoutChangeListener);
         }
     }
     _updateSpanCount() {
@@ -754,7 +726,8 @@ export class CollectionView extends CollectionViewBase {
         });
     }
     refreshVisibleItems() {
-        if (!this.android) {
+        const view = this.nativeViewProtected;
+        if (!view) {
             return;
         }
         const ids = Array.from(this._viewHolders)
@@ -764,7 +737,8 @@ export class CollectionView extends CollectionViewBase {
         this._listViewAdapter.notifyItemRangeChanged(ids[0], ids[ids.length - 1] - ids[0] + 1);
     }
     isItemAtIndexVisible(index) {
-        if (!this.android) {
+        const view = this.nativeViewProtected;
+        if (!view) {
             return false;
         }
         const layoutManager = this.layoutManager;
@@ -776,9 +750,10 @@ export class CollectionView extends CollectionViewBase {
         return false;
     }
     refresh() {
-        if (!this.android) {
+        if (!this.nativeViewProtected) {
             return;
         }
+        const view = this.nativeViewProtected;
         if (!this.isLoaded) {
             this._isDataDirty = true;
             return;
@@ -787,67 +762,65 @@ export class CollectionView extends CollectionViewBase {
         this._lastLayoutKey = this._innerWidth + '_' + this._innerHeight;
         let adapter = this._listViewAdapter;
         if (!adapter) {
-            adapter = this._listViewAdapter = this.createComposedAdapter();
+            adapter = this._listViewAdapter = this.createComposedAdapter(this.nativeViewProtected);
             adapter.setHasStableIds(!!this._itemIdGenerator);
-            this.android.setAdapter(adapter);
+            view.setAdapter(adapter);
         }
-        else if (!this.android.getAdapter()) {
-            this.android.setAdapter(adapter);
+        else if (!view.getAdapter()) {
+            view.setAdapter(adapter);
         }
         this._updateSpanCount();
         adapter.notifyDataSetChanged();
-        const args = {
-            eventName: CollectionViewBase.dataPopulatedEvent,
-            object: this
-        };
-        this.notify(args);
+        this.notify({ eventName: CollectionViewBase.dataPopulatedEvent });
     }
     //@ts-ignore
     get scrollOffset() {
-        if (!this.android) {
+        const view = this.nativeViewProtected;
+        if (!view) {
             return 0;
         }
-        return (this.isHorizontal() ? this.android.computeHorizontalScrollOffset() : this.android.computeVerticalScrollOffset()) / Utils.layout.getDisplayDensity();
+        return (this.isHorizontal() ? view.computeHorizontalScrollOffset() : view.computeVerticalScrollOffset()) / Utils.layout.getDisplayDensity();
     }
     get verticalOffsetX() {
-        if (!this.android) {
+        const view = this.nativeViewProtected;
+        if (!view) {
             return 0;
         }
-        return this.android.computeHorizontalScrollOffset() / Utils.layout.getDisplayDensity();
+        return view.computeHorizontalScrollOffset() / Utils.layout.getDisplayDensity();
     }
     get verticalOffsetY() {
-        if (!this.android) {
+        const view = this.nativeViewProtected;
+        if (!view) {
             return 0;
         }
-        return this.android.computeVerticalScrollOffset() / Utils.layout.getDisplayDensity();
+        return view.computeVerticalScrollOffset() / Utils.layout.getDisplayDensity();
     }
     scrollToIndex(index, animated = true) {
-        if (!this.android) {
+        if (!this.nativeViewProtected) {
             return;
         }
         if (animated) {
-            this.android.smoothScrollToPosition(index);
+            this.nativeViewProtected.smoothScrollToPosition(index);
         }
         else {
-            this.android.scrollToPosition(index);
+            this.nativeViewProtected.scrollToPosition(index);
         }
     }
     _setPadding(newPadding) {
-        if (this.android) {
-            const padding = {
-                top: this.android.getPaddingTop(),
-                right: this.android.getPaddingRight(),
-                bottom: this.android.getPaddingBottom(),
-                left: this.android.getPaddingLeft()
-            };
-            // tslint:disable-next-line:prefer-object-spread
-            const newValue = Object.assign(padding, newPadding);
-            this.android.setClipToPadding(false);
-            this.android.setPadding(newValue.left, newValue.top, newValue.right, newValue.bottom);
-            this.updateInnerSize();
-        }
-    }
-    createComposedAdapter() {
+        const nativeView = this.nativeViewProtected;
+        const padding = {
+            top: nativeView.getPaddingTop(),
+            right: nativeView.getPaddingRight(),
+            bottom: nativeView.getPaddingBottom(),
+            left: nativeView.getPaddingLeft()
+        };
+        // tslint:disable-next-line:prefer-object-spread
+        const newValue = Object.assign(padding, newPadding);
+        nativeView.setClipToPadding(false);
+        nativeView.setPadding(newValue.left, newValue.top, newValue.right, newValue.bottom);
+        this.updateInnerSize();
+    }
+    createComposedAdapter(recyclerView) {
         const adapter = new com.nativescript.collectionview.Adapter();
         adapter.adapterInterface = new com.nativescript.collectionview.AdapterInterface({
             getItemId: this.getItemId.bind(this),
@@ -895,7 +868,7 @@ export class CollectionView extends CollectionViewBase {
             const selector = this._itemTemplateSelector;
             const dataItem = this.getItemAtIndex(position);
             if (dataItem) {
-                selectorType = selector(dataItem, position, this.items);
+                selectorType = selector.call(this, dataItem, position, this.items);
             }
         }
         return this.templateKeyToNativeItem(selectorType);
@@ -997,28 +970,25 @@ export class CollectionView extends CollectionViewBase {
         }
         this._viewHolders.add(holder);
         if (Trace.isEnabled()) {
-            CLog(CLogTypes.log, 'onCreateViewHolder', this._viewHolders.size);
+            CLog(CLogTypes.log, 'onCreateViewHolder', viewType, this.getKeyByValue(viewType));
         }
         return holder;
     }
+    notifyForItemAtIndex(eventName, view, index, bindingContext, native) {
+        const args = { eventName, object: this, index, view, ios: native, bindingContext };
+        this.notify(args);
+        return args;
+    }
     onBindViewHolder(holder, position) {
         if (Trace.isEnabled()) {
             CLog(CLogTypes.log, 'onBindViewHolder', position);
         }
         let view = holder.view;
-        const bindingContext = this._prepareItem(view, position);
         const isNonSync = holder['defaultItemView'] === true;
-        holder['position'] = position;
         view = isNonSync ? view.content : view;
-        const args = {
-            eventName: CollectionViewBase.itemLoadingEvent,
-            index: position,
-            object: this,
-            view,
-            bindingContext,
-            android: holder
-        };
-        this.notify(args);
+        const bindingContext = this._prepareItem(view, position);
+        holder['position'] = position;
+        const args = this.notifyForItemAtIndex(CollectionViewBase.itemLoadingEvent, view, position, bindingContext, holder);
         if (isNonSync && args.view !== view) {
             view = args.view;
             // the view has been changed on the event handler
@@ -1044,14 +1014,13 @@ export class CollectionView extends CollectionViewBase {
         if (height || !view.height) {
             view.height = Utils.layout.toDeviceIndependentPixels(height);
         }
-        if (this.hasListeners(CollectionViewBase.displayItemEvent)) {
-            this.notify({
-                eventName: CollectionViewBase.displayItemEvent,
-                index: position,
-                object: this,
-                cell: holder
-            });
-        }
+        // if (this.hasListeners(CollectionViewBase.displayItemEvent) ) {
+        //     this.notify<CollectionViewItemDisplayEventData>({
+        //         eventName: CollectionViewBase.displayItemEvent,
+        //         index:position,
+        //         object: this,
+        //     });
+        // }
         if (Trace.isEnabled()) {
             CLog(CLogTypes.log, 'onBindViewHolder done ', position);
         }