Skip to content

Commit 5c092a9

Browse files
committed
fix(toolbar): allow native scroll on scrollable tabbar in iOS theme
Skip the iOS touch-highlight effect (and its touch-action: none rule) for toolbar panes inside a tabbar-scrollable, so the pane can scroll horizontally via touch. Closes #4391.
1 parent b10e1f0 commit 5c092a9

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

src/core/components/touch-highlight/touch-highlight-ios.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.ios {
2-
.toolbar-pane,
2+
.toolbar-pane:not(.tabbar-scrollable *),
33
.navbar .left,
44
.navbar .right,
55
.actions-group:not(.actions-grid .actions-group),

src/core/components/touch-highlight/touch-highlight.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const initTouchHighlight = (app) => {
6464
const d = data;
6565
const el = e.target.closest(elements);
6666
if (!el) return;
67+
if (el.closest('.tabbar-scrollable')) return;
6768
if (d.currentEl === el) return;
6869
d.currentEl = el;
6970

0 commit comments

Comments
 (0)