Skip to content

Fix vertical scroll for RTL languages #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
larryonoff wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix vertical scroll for RTL languages #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Sources/SwiftUIPager/PageConfiguration/SwipeDirection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ public enum VerticalSwipeDirection {
case bottomToTop
}

extension Locale {
extension LayoutDirection {
var isRightToLeft: Bool {
guard let language = Locale.preferredLanguages.first else { return true }
let direction = Locale.characterDirection(forLanguage: language)
return direction == .rightToLeft
return self == .rightToLeft
}
}
10 changes: 8 additions & 2 deletions Sources/SwiftUIPager/PagerContent.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ extension Pager {

/*** State and Binding properties ***/

@Environment(\.layoutDirection) var layoutDirection

/// Page index
@ObservedObject var pagerModel: Page

Expand Down Expand Up @@ -358,7 +360,9 @@ extension Pager.PagerContent {
self.pagerModel.draggingVelocity = Double(offsetIncrement) / timeIncrement
}

var newOffset = self.draggingOffset + offsetIncrement * (Locale.current.isRightToLeft ? -1 : 1)
let isRightToLeft = layoutDirection.isRightToLeft && isHorizontal

var newOffset = self.draggingOffset + offsetIncrement * (isRightToLeft ? -1 : 1)
if !allowsMultiplePagination {
newOffset = self.direction == .forward ? max(newOffset, self.pageRatio * -self.pageDistance) : min(newOffset, self.pageRatio * self.pageDistance)
}
Expand Down Expand Up @@ -420,8 +424,10 @@ extension Pager.PagerContent {
}

var dragResult: (page: Int, increment: Int) {
let isRightToLeft = layoutDirection.isRightToLeft && isHorizontal

let currentPage = self.currentPage(sensitivity: sensitivity.value)
let velocity = -self.draggingVelocity * (Locale.current.isRightToLeft ? -1 : 1)
let velocity = -self.draggingVelocity * (isRightToLeft ? -1 : 1)

guard allowsMultiplePagination else {
var newPage = currentPage
Expand Down