From 9f3aed1a9095d2be6bad492c7c114b9b1188d6f3 Mon Sep 17 00:00:00 2001 From: James Chu Date: Tue, 5 Nov 2024 12:29:58 +0800 Subject: [PATCH] ZK-4961: Unable to scroll in grid and listbox when using non-native scrollbar on mobile --- zkdoc/release-note | 1 + zul/src/main/resources/web/js/zul/grid/Grid.ts | 5 +---- zul/src/main/resources/web/js/zul/sel/Listbox.ts | 5 +---- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/zkdoc/release-note b/zkdoc/release-note index f1d20fb2b2..b4277a77be 100644 --- a/zkdoc/release-note +++ b/zkdoc/release-note @@ -47,6 +47,7 @@ ZK 10.1.0 ZK-5825: Clicking bandbox button on Android does not focus input ZK-5833: ZK-423 regression on Android ZK-4960: Listbox doesn't keep scrollbar position when applying hflex="min" on a listheader in mobile + ZK-4961: Unable to scroll in grid and listbox when using non-native scrollbar on mobile * Upgrade Notes + Remove Htmls.encodeJavaScript(), Strings.encodeJavaScript(), Strings.escape() with Strings.ESCAPE_JAVASCRIPT, and replace them with OWASP Java Encoder APIs instead. diff --git a/zul/src/main/resources/web/js/zul/grid/Grid.ts b/zul/src/main/resources/web/js/zul/grid/Grid.ts index e537f446ab..316d95be89 100644 --- a/zul/src/main/resources/web/js/zul/grid/Grid.ts +++ b/zul/src/main/resources/web/js/zul/grid/Grid.ts @@ -250,11 +250,8 @@ export class Grid extends zul.mesh.MeshWidget { override onSize(): void { super.onSize(); var canInitScrollbar = this.desktop && !this._nativebar; - // refix ZK-2840: only init scrollbar when height or vflex is set in mobile if (!this._scrollbar && canInitScrollbar) { - if (!zk.mobile || (zk.mobile && (this.getHeight() || this.getVflex()))) { - this._scrollbar = zul.mesh.Scrollbar.init(this); // 1823278: should show scroll bar here - } + this._scrollbar = zul.mesh.Scrollbar.init(this); // 1823278: should show scroll bar here } setTimeout(() => { if (canInitScrollbar) { diff --git a/zul/src/main/resources/web/js/zul/sel/Listbox.ts b/zul/src/main/resources/web/js/zul/sel/Listbox.ts index 23d74dee52..d7ba9fae3d 100644 --- a/zul/src/main/resources/web/js/zul/sel/Listbox.ts +++ b/zul/src/main/resources/web/js/zul/sel/Listbox.ts @@ -196,11 +196,8 @@ export class Listbox extends zul.sel.SelectWidget { override onSize(): void { super.onSize(); var canInitScrollbar = this.desktop && !this.inSelectMold() && !this._nativebar; - // refix ZK-2840: only init scrollbar when height or vflex is set in mobile if (!this._scrollbar && canInitScrollbar) { - if (!zk.mobile || (zk.mobile && (this.getHeight() || this.getVflex()))) { - this._scrollbar = zul.mesh.Scrollbar.init(this); // 1823278: should show scrollbar here - } + this._scrollbar = zul.mesh.Scrollbar.init(this); // 1823278: should show scrollbar here } setTimeout(() => { if (this.desktop) {