feat: reorderLongPressEnabled property (disabled by default)

Author: farfromrefug

src/collectionview-common.ts

@@ -136,6 +136,7 @@ export abstract class CollectionViewBase extends View implements CollectionViewD
     public loadMoreThreshold: number;
 
     public reorderEnabled: boolean;
+    public reorderLongPressEnabled: boolean;
     protected _dataUpdatesSuspended = false;
 
     public layoutStyle: string = 'grid';
@@ -644,3 +645,9 @@ export const reorderingEnabledProperty = new Property<CollectionViewBase, boolea
     valueConverter: booleanConverter,
 });
 reorderingEnabledProperty.register(CollectionViewBase);
+export const reorderLongPressEnabledProperty = new Property<CollectionViewBase, boolean>({
+    name: 'reorderLongPressEnabled',
+    defaultValue: false,
+    valueConverter: booleanConverter,
+});
+reorderLongPressEnabledProperty.register(CollectionViewBase);

src/collectionview.android.ts

@@ -15,7 +15,7 @@ import {
     profile,
 } from '@nativescript/core';
 import { layout } from '@nativescript/core/utils/utils';
-import { CollectionViewItemDisplayEventData, CollectionViewItemEventData, Orientation, reorderingEnabledProperty, reverseLayoutProperty } from './collectionview';
+import { CollectionViewItemDisplayEventData, CollectionViewItemEventData, Orientation, reorderLongPressEnabledProperty, reorderingEnabledProperty, reverseLayoutProperty } from './collectionview';
 import { CLog, CLogTypes, CollectionViewBase, ListViewViewTypes, isScrollEnabledProperty, orientationProperty } from './collectionview-common';
 
 export * from './collectionview-common';
@@ -567,15 +567,8 @@ export class CollectionView extends CollectionViewBase {
 
     _longPressGesture: androidx.core.view.GestureDetectorCompat;
     _itemTouchListerner: androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
-    public [reorderingEnabledProperty.setNative](value: boolean) {
+    public [reorderLongPressEnabledProperty.setNative](value: boolean) {
         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.nativeViewProtected);
-            }
             if (!this._longPressGesture) {
                 this._longPressGesture = new androidx.core.view.GestureDetectorCompat(this._context, new LongPressGestureListenerImpl(new WeakRef(this)));
                 this._itemTouchListerner = new androidx.recyclerview.widget.RecyclerView.OnItemTouchListener({
@@ -590,7 +583,22 @@ export class CollectionView extends CollectionViewBase {
                     onRequestDisallowInterceptTouchEvent:(disallowIntercept: boolean) =>{
                     }
                 });
-                this.nativeViewProtected.addOnItemTouchListener(this._itemTouchListerner);
+            }
+            this.nativeViewProtected.addOnItemTouchListener(this._itemTouchListerner);
+        } else {
+            if (this._itemTouchListerner) {
+                this.nativeViewProtected.removeOnItemTouchListener(this._itemTouchListerner);
+            }
+        }
+    }
+    public [reorderingEnabledProperty.setNative](value: boolean) {
+        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.nativeViewProtected);
             }
         }
     }

src/collectionview.ios.ts

@@ -19,7 +19,7 @@ import {
     profile,
 } from '@nativescript/core';
 import { layout } from '@nativescript/core/utils/utils';
-import { CollectionViewItemDisplayEventData, CollectionViewItemEventData, Orientation, reorderingEnabledProperty, reverseLayoutProperty } from './collectionview';
+import { CollectionViewItemDisplayEventData, CollectionViewItemEventData, Orientation, reorderLongPressEnabledProperty, reorderingEnabledProperty, reverseLayoutProperty } from './collectionview';
 import { CLog, CLogTypes, CollectionViewBase, ListViewViewTypes, isBounceEnabledProperty, isScrollEnabledProperty, itemTemplatesProperty, orientationProperty } from './collectionview-common';
 
 export * from './collectionview-common';
@@ -274,7 +274,7 @@ export class CollectionView extends CollectionViewBase {
                 break;
         }
     }
-    public [reorderingEnabledProperty.setNative](value: boolean) {
+    public [reorderLongPressEnabledProperty.setNative](value: boolean) {
         if (value) {
             if (!this.reorderLongPressGesture) {
                 this.reorderLongPressHandler = ReorderLongPressImpl.initWithOwner(new WeakRef(this));
@@ -283,11 +283,17 @@ export class CollectionView extends CollectionViewBase {
             } else {
                 this.reorderLongPressGesture.enabled = true;
             }
-            this.on('touch', this.onReorderingTouch, this);
         } else {
             if (this.reorderLongPressGesture) {
                 this.reorderLongPressGesture.enabled = false;
             }
+        }
+
+    }
+    public [reorderingEnabledProperty.setNative](value: boolean) {
+        if (value) {
+            this.on('touch', this.onReorderingTouch, this);
+        } else {
             this.off('touch', this.onReorderingTouch, this);
         }
     }