From 83249ab534c7218753b3a8f18248c24e68a6bdbb Mon Sep 17 00:00:00 2001
From: 7015725 <user@example.com>
Date: Fri, 22 May 2026 09:16:25 +0800
Subject: [PATCH] Fix ToolApp surface swipe back blocking

---
 code/th_15_extra.js | 7 +++++--
 manifest.json       | 6 +++---
 manifest.sig        | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/th_15_extra.js b/code/th_15_extra.js
index 495112a..f8d10b0 100644
--- a/code/th_15_extra.js
+++ b/code/th_15_extra.js
@@ -1257,8 +1257,11 @@ FloatBallAppWM.prototype.isToolAppBackInteractiveView = function(v) {
       var rvCls2 = java.lang.Class.forName("android.support.v7.widget.RecyclerView");
       if (rvCls2 && rvCls2.isInstance(v)) return true;
     } catch(eRv2) {}
-    try { if (v.isClickable && v.isClickable()) return true; } catch(eClick) {}
-    try { if (v.isLongClickable && v.isLongClickable()) return true; } catch(eLong) {}
+    // 不把所有 clickable/longClickable 都当成阻断项：ToolHub 大量卡片/容器为了 ripple 都会 setClickable(true)，
+    // 若在 surface 横滑模式下阻断它们，几乎整页都会 rootBackBlocked=true，导致滑动返回一直触发不了。
+    // DOWN 已经放行给子控件，只有超过横滑阈值后才拦截，所以保留按钮/Switch/SeekBar/EditText/列表等强交互控件即可。
+    /* try { if (v.isClickable && v.isClickable()) return true; } catch(eClick) {} */
+    /* try { if (v.isLongClickable && v.isLongClickable()) return true; } catch(eLong) {} */
   } catch(e) {}
   return false;
 };
diff --git a/manifest.json b/manifest.json
index a66268f..a368733 100644
--- a/manifest.json
+++ b/manifest.json
@@ -58,8 +58,8 @@
       "size": 304993
     },
     "th_15_extra.js": {
-      "sha256": "e0d3b2f39ac13126f4534756ea0d928955e540e63d4fb20eddc53c72fe63f720",
-      "size": 124928
+      "sha256": "09b47453362f4394b0ea200a0e5775d15cae60e5ca9784b5c6f2eaf3c890242d",
+      "size": 125364
     },
     "th_16_entry.js": {
       "sha256": "6c59d9891cd010647f84c3db93f1cf95c7bbfb758470ea21044bf72eb8ff73d1",
@@ -68,5 +68,5 @@
   },
   "keyId": "toolhub-targets-2026-rsa3072",
   "schema": 2,
-  "version": 20260522005618
+  "version": 20260522011606
 }
diff --git a/manifest.sig b/manifest.sig
index c3b1e40..bb35742 100644
--- a/manifest.sig
+++ b/manifest.sig
@@ -1 +1 @@
-UMkA/Pj4p59+4HuG1tDQY3FxqOn4DK4/chmqh62NAfUoQ8EpTqVzMzuuJInAAdhGZjAmJK4esjOpOATXjHZQiwaaFsm5EGBXq/bxJTuxuc8714p8qIwvFGXVtQuv7pBS0SHAAFhQ0a9JKdMwSo5zyZeEO/NjTE8VbloQu42R562Dfuyas5tMVvawG2u34kHRGvsSQFPz28Ju4r3fyUg8UIareb8HK8OW4mniQLHoNdueCgERGCPavhTSbWzXdO7QozExFFoMgxlbEFH8SJ6Ta8/cVhLj83oElX2bhCuOBvxHvb2Rli4LGoJezlQgetv/vCz31bsZZhpGuRtwjMVjm9qK0MxTB7XfZdgMjmgbYDEbEeoKxYwhgPaQiKIcWlSzqv9PmsJYwN2MYI5QHbc2ibb7JQ72dslgUA/mtIUgNmjLbY1wNSLemmh5C5Igwn34hGORAQ+UmGjIP60oEADWRHt6teLqDPHrI3n458lIW7viOspmMaQmhcZi3tMEd+oa
+B9marjK9C0psm0E8hNucZxC7/jxz/v+y3bnG8O601Mc/s/qy3WODyi3gn8Wof6USLOY74oLPIm+oF57+np+zqJi33relqSNWfdx/+7Oj62hO44d6r5u6IJo4mW7YTLo6cKSRpvRGnf3NxL9hhOcbNeojVr4dTR3AOVGEI05TquHM6EmK21+1H9odxnjo2m9WnSHraCaXnmdrudZUir10W/4MZx9AzVawJjITDsGBvJbEDPmGYHspvWZx9J589YlmT42zWz3nG5tBiuRXvKRbhSEX92LBIOe6zvfMP887qM8eOWHx0V0IyqVf5eyIbUavAlXVJl4lp28Z/OWnWyKVDg1onI9gqteahhPodpH7z9r8ASzuOLjxzZ31MT/NpO3ZyvqWgOhxgsuXHRuvEqQPhyhBcjjifV3dp8DIAy6AMJRQ3zRtrVtVOY9EoG1cc4TdjCKky8Wte4L7rJlUR12mli4sI63Y2lGJ3XwQYztkKQea+D/5jr0I692YYh+CaM1/