fix(core): Scroll listener register failure after unregister (#10368)

CatchABus · web-flow · commit e4fe276bed15 · 2023-08-25T15:23:17.000-07:00
diff --git a/packages/core/ui/scroll-view/index.android.ts b/packages/core/ui/scroll-view/index.android.ts
@@ -130,10 +130,10 @@ export class ScrollView extends ScrollViewBase {
 
 	protected attachNative() {
 		if (!this.handler) {
-			const that = new WeakRef(this);
+			const viewRef = new WeakRef(this);
 			this.handler = new android.view.ViewTreeObserver.OnScrollChangedListener({
 				onScrollChanged: function () {
-					const owner: ScrollView = that.get();
+					const owner: ScrollView = viewRef.get();
 					if (owner) {
 						owner._onScrollChanged();
 					}
@@ -166,9 +166,13 @@ export class ScrollView extends ScrollViewBase {
 		}
 	}
 
-	protected dettachNative() {
-		this.nativeViewProtected.getViewTreeObserver().removeOnScrollChangedListener(this.handler);
-		this.handler = null;
+	protected detachNative() {
+		if (this.handler) {
+			if (this.nativeViewProtected) {
+				this.nativeViewProtected.getViewTreeObserver().removeOnScrollChangedListener(this.handler);
+			}
+			this.handler = null;
+		}
 	}
 }
 
diff --git a/packages/core/ui/scroll-view/index.ios.ts b/packages/core/ui/scroll-view/index.ios.ts
@@ -49,12 +49,6 @@ export class ScrollView extends ScrollViewBase {
 		this._setNativeClipToBounds();
 	}
 
-	disposeNativeView() {
-		this.dettachNative();
-		this._delegate = null;
-		super.disposeNativeView();
-	}
-
 	_setNativeClipToBounds() {
 		if (!this.nativeViewProtected) {
 			return;
@@ -70,9 +64,12 @@ export class ScrollView extends ScrollViewBase {
 		}
 	}
 
-	protected dettachNative() {
-		if (this.nativeViewProtected) {
-			this.nativeViewProtected.delegate = null;
+	protected detachNative() {
+		if (this._delegate) {
+			if (this.nativeViewProtected) {
+				this.nativeViewProtected.delegate = null;
+			}
+			this._delegate = null;
 		}
 	}
 
diff --git a/packages/core/ui/scroll-view/scroll-view-common.ts b/packages/core/ui/scroll-view/scroll-view-common.ts
@@ -21,48 +21,45 @@ export abstract class ScrollViewBase extends ContentView implements ScrollViewDe
 
 		if (arg === ScrollViewBase.scrollEvent) {
 			this._scrollChangeCount++;
-			this.attach();
+			if (this.nativeViewProtected) {
+				this.attachNative();
+			}
 		}
 	}
 
 	public removeEventListener(arg: string, callback?: (data: EventData) => void, thisArg?: any): void {
 		super.removeEventListener(arg, callback, thisArg);
 
 		if (arg === ScrollViewBase.scrollEvent) {
-			this._scrollChangeCount--;
-			this.dettach();
-		}
-	}
-
-	@profile
-	public onLoaded() {
-		super.onLoaded();
-
-		this.attach();
-	}
+			if (this._scrollChangeCount > 0) {
+				this._scrollChangeCount--;
 
-	public disposeNativeView() {
-		this.dettach();
-		super.disposeNativeView();
+				if (this.nativeViewProtected && this._scrollChangeCount === 0) {
+					this.detachNative();
+				}
+			}
+		}
 	}
 
-	private attach() {
-		if (this._scrollChangeCount > 0 && this.isLoaded) {
+	initNativeView() {
+		super.initNativeView();
+		if (this._scrollChangeCount > 0) {
 			this.attachNative();
 		}
 	}
 
-	private dettach() {
-		if (this._scrollChangeCount === 0 && this.isLoaded) {
-			this.dettachNative();
+	public disposeNativeView() {
+		if (this._scrollChangeCount > 0) {
+			this.detachNative();
 		}
+		super.disposeNativeView();
 	}
 
 	protected attachNative() {
 		//
 	}
 
-	protected dettachNative() {
+	protected detachNative() {
 		//
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,10 @@ export class ScrollView extends ScrollViewBase {`
`130`	`130`
`131`	`131`	`protected attachNative() {`
`132`	`132`	`if (!this.handler) {`
`133`		`- const that = new WeakRef(this);`
	`133`	`+ const viewRef = new WeakRef(this);`
`134`	`134`	`this.handler = new android.view.ViewTreeObserver.OnScrollChangedListener({`
`135`	`135`	`onScrollChanged: function () {`
`136`		`- const owner: ScrollView = that.get();`
	`136`	`+ const owner: ScrollView = viewRef.get();`
`137`	`137`	`if (owner) {`
`138`	`138`	`owner._onScrollChanged();`
`139`	`139`	`}`
`@@ -166,9 +166,13 @@ export class ScrollView extends ScrollViewBase {`
`166`	`166`	`}`
`167`	`167`	`}`
`168`	`168`
`169`		`- protected dettachNative() {`
`170`		`- this.nativeViewProtected.getViewTreeObserver().removeOnScrollChangedListener(this.handler);`
`171`		`- this.handler = null;`
	`169`	`+ protected detachNative() {`
	`170`	`+ if (this.handler) {`
	`171`	`+ if (this.nativeViewProtected) {`
	`172`	`+ this.nativeViewProtected.getViewTreeObserver().removeOnScrollChangedListener(this.handler);`
	`173`	`+ }`
	`174`	`+ this.handler = null;`
	`175`	`+ }`
`172`	`176`	`}`
`173`	`177`	`}`
`174`	`178`
Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,6 @@ export class ScrollView extends ScrollViewBase {`
`49`	`49`	`this._setNativeClipToBounds();`
`50`	`50`	`}`
`51`	`51`
`52`		`- disposeNativeView() {`
`53`		`- this.dettachNative();`
`54`		`- this._delegate = null;`
`55`		`- super.disposeNativeView();`
`56`		`- }`
`57`		`-`
`58`	`52`	`_setNativeClipToBounds() {`
`59`	`53`	`if (!this.nativeViewProtected) {`
`60`	`54`	`return;`
`@@ -70,9 +64,12 @@ export class ScrollView extends ScrollViewBase {`
`70`	`64`	`}`
`71`	`65`	`}`
`72`	`66`
`73`		`- protected dettachNative() {`
`74`		`- if (this.nativeViewProtected) {`
`75`		`- this.nativeViewProtected.delegate = null;`
	`67`	`+ protected detachNative() {`
	`68`	`+ if (this._delegate) {`
	`69`	`+ if (this.nativeViewProtected) {`
	`70`	`+ this.nativeViewProtected.delegate = null;`
	`71`	`+ }`
	`72`	`+ this._delegate = null;`
`76`	`73`	`}`
`77`	`74`	`}`
`78`	`75`