Skip to content

Commit 298de7c

Browse files
authored
fix(VirtualScroll): account for RTL in horizontal scroll (quasarframework#7549)
1 parent ca0072b commit 298de7c

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

ui/src/components/virtual-scroll/QVirtualScroll.sass

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
outline: 0
44

55
&__padding
6-
background: linear-gradient(transparent, transparent 20%, rgba(128, 128, 128, .03) 20%, rgba(128, 128, 128, .08) 50%, rgba(128, 128, 128, .03) 80%, transparent 80%, transparent)
7-
background-size: 100% 50px
6+
background: linear-gradient(transparent, transparent 20%, rgba(128, 128, 128, .03) 20%, rgba(128, 128, 128, .08) 50%, rgba(128, 128, 128, .03) 80%, transparent 80%, transparent) #{"/* rtl:ignore */"}
7+
background-size: 100% 50px #{"/* rtl:ignore */"}
88

99
.q-table &
1010
tr
@@ -30,5 +30,5 @@
3030
flex: 0 0 auto
3131

3232
&__padding
33-
background: linear-gradient(to left, transparent, transparent 20%, rgba(128, 128, 128, .03) 20%, rgba(128, 128, 128, .08) 50%, rgba(128, 128, 128, .03) 80%, transparent 80%, transparent)
34-
background-size: 50px 100%
33+
background: linear-gradient(to left, transparent, transparent 20%, rgba(128, 128, 128, .03) 20%, rgba(128, 128, 128, .08) 50%, rgba(128, 128, 128, .03) 80%, transparent 80%, transparent) #{"/* rtl:ignore */"}
34+
background-size: 50px 100% #{"/* rtl:ignore */"}

ui/src/components/virtual-scroll/QVirtualScroll.styl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
outline: 0
44

55
&__padding
6-
background: linear-gradient(transparent, transparent 20%, rgba(128, 128, 128, .03) 20%, rgba(128, 128, 128, .08) 50%, rgba(128, 128, 128, .03) 80%, transparent 80%, transparent)
7-
background-size: 100% 50px
6+
background: linear-gradient(transparent, transparent 20%, rgba(128, 128, 128, .03) 20%, rgba(128, 128, 128, .08) 50%, rgba(128, 128, 128, .03) 80%, transparent 80%, transparent) /* rtl:ignore */
7+
background-size: 100% 50px /* rtl:ignore */
88

99
.q-table &
1010
tr
@@ -30,5 +30,5 @@
3030
flex: 0 0 auto
3131

3232
&__padding
33-
background: linear-gradient(to left, transparent, transparent 20%, rgba(128, 128, 128, .03) 20%, rgba(128, 128, 128, .08) 50%, rgba(128, 128, 128, .03) 80%, transparent 80%, transparent)
34-
background-size: 50px 100%
33+
background: linear-gradient(to left, transparent, transparent 20%, rgba(128, 128, 128, .03) 20%, rgba(128, 128, 128, .08) 50%, rgba(128, 128, 128, .03) 80%, transparent 80%, transparent) /* rtl:ignore */
34+
background-size: 50px 100% /* rtl:ignore */

ui/src/mixins/virtual-scroll.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ function getScrollDetails (
3131

3232
if (horizontal === true) {
3333
if (parent === window) {
34-
details.scrollStart = window.pageXOffset || window.scrollX || document.body.scrollLeft || 0
34+
details.scrollStart = Math.abs(window.pageXOffset || window.scrollX || document.body.scrollLeft || 0)
3535
details.scrollViewSize += window.innerWidth
3636
}
3737
else {
38-
details.scrollStart = parentCalc.scrollLeft
38+
details.scrollStart = Math.abs(parentCalc.scrollLeft)
3939
details.scrollViewSize += parentCalc.clientWidth
4040
}
4141
details.scrollMaxSize = parentCalc.scrollWidth
@@ -336,7 +336,7 @@ export default {
336336

337337
this.__setScroll(
338338
scrollEl,
339-
scrollPosition,
339+
(this.$q.lang.rtl === true ? -1 : 1) * scrollPosition,
340340
this.virtualScrollHorizontal
341341
)
342342

0 commit comments

Comments
 (0)